Updated develop into master ready for v1.0.0 release
Conflicts:
	.bowerrc
	Gruntfile.js
	config.js
	package.json
	src/core/js/app.js