Merge branch 'master' of
https://fukudayasuo@github.com/hifive-labs/hifivemain.git

Conflicts:
	hifive/src/main/webapp/test/h5.core.controller.js