Validation
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/admin/index.jade
	bower.json
Merged