fixed callbax
Merge branch 'master' of https://github.com/darioml/soh-get-stuff-done

Conflicts:
	rails-backend/app/assets/javascripts/angularjs/controllers.js

rails-backend/app/assets/javascripts/angularjs/landing/landingController
.js
	rails-backend/public/partials/Project.html