Add content view.
Merge branch 'master' of git@github.com:seedboxer/seedboxer.git

Conflicts:
	seedboxer-web/src/main/webapp/resources/js/controllers.js
	seedboxer-web/src/main/webapp/resources/views/home.html
	seedboxer-web/src/main/webapp/resources/views/my-profile.html