Added live-demo steps for grunt
Merge branch 'master' into gh-pages

Conflicts:
	code/1-controller/app/scripts/app.js
	code/1-controller/app/scripts/services/calc.js
	code/2-service/app/views/partials/control-group.html
	code/3-resource/app/index.html