started homepage additions
Merge remote-tracking branch 'angular/master'

Conflicts:
	app/scripts/controllers/main.js
catch up