Major updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/html/scripts/app.main.js
Angular.js attached