could need this..
Merge remote-tracking branch 'origin/component/blog' into component/blog

Conflicts:
	src/me/arrdem/blog/views/common.clj