Changes after Corey review
Conflicts:
	js/angular-pieces.js