Merge branch 'master' of https://github.com/jgnan1981/hurricane

Conflicts:
	README.md
	hurricane.gemspec
	lib/generators/hurricane/templates/i18n/en.yml
	lib/generators/hurricane/templates/i18n/zh.yml
	lib/generators/hurricane/templates/rails/haml/scaffold/_form.html.haml
	lib/generators/hurricane/templates/views/users/_form.html.haml
	lib/hurricane/helpers/hurricane_helper.rb
	lib/hurricane/helpers/ui_component_helper.rb
	project_template.rb
merge baranch
Submit changes
Merge branch 'master' of https://github.com/jgnan1981/hurricane

Conflicts:
	README.md
	hurricane.gemspec
	lib/generators/hurricane/templates/i18n/en.yml
	lib/generators/hurricane/templates/rails/haml/scaffold/_form.html.haml
	lib/generators/hurricane/templates/views/users/_form.html.haml
	lib/hurricane/helpers/hurricane_helper.rb
	lib/hurricane/helpers/ui_component_helper.rb
	project_template.rb
fix conflits