0.4.2
Merge branch 'hotfix/0.4.2'
Merge tag '0.4.2' into develop

0.4.2

Conflicts:
	bower.json
	package.json