Merge branch 'release/0.2.0'
call prepare to get bower modules
bump version
Merge branch 'hotfix/0.2.1' into develop

Conflicts:
	package.json