Merge branch 'master' into angular

Conflicts:
	package.json
Merge branch 'master' into angular
Merge branch 'master' into angular

Conflicts:
	src/jade/index.jade
Merge branch 'master' into angular
Merge branch 'master' into angular
Update README.md

Section about using JavaScript instead of CoffeeScript
add .coffee extension to browserify extensions
change browserify paths to use bower_components directory
Merge branch 'master' into angular
Merge branch 'angular' into MEAN