Fix dep issue.
Merge branch 'master' into develop

Conflicts:
	package.json
bumping bower.json
0.1.0
Merge branch 'release/0.1.0'