Merge branch 'release/0.2'
updated version number
Merge branch 'release/0.3'
adapted verion number
Merge branch 'release/0.4.0'

Conflicts:
	bower.json