Cleaned code
Merge branch 'master' of github.com:darioml/soh-get-stuff-done

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