Merge branch 'page-templates' of https://github.com/ToucheSir/MD-Leadership into page-templates

Conflicts:
	client/bower.json
	client/src/app/about/about.js
	client/src/app/app.js
	client/src/app/home/home.js
	client/src/index.html
I hate IE.
Merge branch 'page-templates' of https://github.com/ToucheSir/MD-Leadership into page-templates