Merge origin/master

Conflicts:
	app/js/services.js
Merge origin/master
Merge origin/master

Conflicts:
	app/js/services.js