Merge branch 'develop'
Merge branch 'develop'
quick change
Merge branch 'master' into develop
Merge branch 'feature/user-page' into develop
Changed fork me on github ribbon
moved routes to a controller
merge