fix bug
Merge branch 'master' of github.com:grengojbo/generator-beego

Conflicts:
	app/templates/views/_index.tpl
	package.json
merge