Fixed up the build progress for Angular, moved some things around.

Conflicts:
	app/styles/fonts/grotesquemtstd-light-webfont.eot
	app/styles/fonts/grotesquemtstd-light-webfont.svg
	app/styles/fonts/grotesquemtstd-light-webfont.ttf
	app/styles/fonts/grotesquemtstd-light-webfont.woff
	app/styles/fonts/grotesquemtstd-lightitalic-webfont.eot
	app/styles/fonts/grotesquemtstd-lightitalic-webfont.svg
	app/styles/fonts/grotesquemtstd-lightitalic-webfont.ttf
	app/styles/fonts/grotesquemtstd-lightitalic-webfont.woff
	app/styles/fonts/ss-social-regular.eot
	app/styles/fonts/ss-social-regular.svg
	app/styles/fonts/ss-social-regular.ttf
	app/styles/fonts/ss-social-regular.woff
	app/styles/fonts/ss-standard.eot
	app/styles/fonts/ss-standard.svg
	app/styles/fonts/ss-standard.ttf
	app/styles/fonts/ss-standard.woff