release 1.10.0
Merge branch 'dev' into release-1.10.0
Merge branch 'release-1.10.0' into release-1.11.0

Conflicts:
	bower.json