Tweaking
Merge branch 'btc' of https://github.com/gautes/edvd.git into btc

Conflicts:
	edvd-web/src/main/webapp/index.html
	edvd-web/src/main/webapp/js/controllers.js
	edvd-web/src/main/webapp/usersettings.html