Merge branch 'firebase' into Multiple-addons

Conflicts:
	app/scripts/core/filters/dayfy.js
	app/styles/core.css
	app/styles/single.css
	app/templates/home.html
	app/templates/single.html