Merge branch 'master' into develop
Ordered settings alphabetically
Set sbt version to 0.13.5
Set scala version to 2.11.2
Merge branch 'develop'