fix(docs): add contributing info to contributing file
fix(docs): add decorator generator description

Add decorator generator description to readme.md
fix(templates): removed grunt-karma from deps

It's installed by generator-karma
feat(build): show elapsed time for grunt tasks

https://github.com/yeoman/yeoman/issues/1151
Merge pull request #307 from eddiemonge/patch-1

fix(docs): add contributing info to contributing file
fix(cli): fix typo in angular:view generator usage
Merge pull request #315 from pborrazas/patch-1

fix(cli): Fix typo in angular:view generator usage
feat(build): switch to use load-grunt-tasks

https://github.com/sindresorhus/load-grunt-tasks
chore(deps): Update dependencies
feat(build): add autoprefixer support

Add support for SASS and vanilla CSS to get automatic vendor prefixes base on
the browsers selected in the Gruntfile.

Closes #317
feat(build): generate karma 0.10 config

Upgraded to generator-karma 0.5.
feat(gen): Change ga.js to analytics.js

Updates the script to the new Google recommended script.
fix(app) remove chromeframe

Chrome frame is being retired
http://blog.chromium.org/2013/06/retiring-chrome-frame.html

Remove message to use Chrome Frame
Remove appropriate metadata from index.html and .htaccess
Merge pull request #322 from manojlds/chromeframeremoval

fix(app) remove chromeframe
chore(gen): revert modular project structure

Reverted until more fleshed out.

Revert "feat(gen): generate a more modular project stucture"

This reverts commit 84d2e4e8e60d297d60882fa84b6542c7279b5a39.

Conflicts:
	view/index.js
chore(test): fix tests after module revert
v0.4.0
Merge branch 'master' of https://github.com/yeoman/generator-angular

Conflicts:
	app/index.js
	package.json
	readme.md
	script-base.js
	templates/common/Gruntfile.js
	templates/common/_package.json
	templates/javascript/controller.js
fix(controller) JavaScript min controller gets $http injected
format(controller) fixed code format