fix setup issue
update version info
Merge branch 'release/0.3.1'

* release/0.3.1:
  update version info
  fix setup issue

Conflicts:
	bower.json