codestyle
Merge branch 'master' of github.com:vodolaz095/hunt
Merge branch 'master' into signupwithverifyemail
Merge branch 'master' into signupwithverifyemail

Conflicts:
	lib/appGenerator.js