Insert the app's CSS after the first <style> because of addCSS addon
Merge branch 'master' of github.com:joshfire/factory-template-sleek

Conflicts:
	app/app.phone.android.optimized.js
	app/app.phone.ios.optimized.js
	app/app.tv.samsung.samsungtv.optimized.js
	app/app.tv.tv.optimized.js
	tasks/server/public/sleek.zip