Fix the versions mess and branches mess
Merge branch 'release/0.0.3'

Conflicts:
	bower.json