Use branches to different scalatra version

If different branches will be used for different scalatra version it would be easier to cherry-pick commits and create new branch with new version. 
Also it's quite easy, I'm ready  to implement this, if that's ok. 
