Merge branch 'release/v0.0.17' into develop
Merge branch 'hotfix/v0.0.18' into develop
version bump
Merge branch 'master' into release/v0.0.20

Conflicts:
	bower.json
Merge branch 'release/v0.0.20'