Merged '1.1.0' into master branch

Conflicts:
	bower.json