Day 5, Step 5: nested views
Day 5, Step 6: updates for build process
slides
Merge branch 'master' into develop

Conflicts:
	day-5/client/dist/index.html
	day-5/client/index.html
	day-5/client/index.tpl.html
	day-5/client/src/app/app.js
	slides/ng-bootcamp-day-5.pptx