Merge branch 'master' of https://github.com/thetmkay/joji into server

Conflicts:
	src/coffee/blog/directives/bloglist.coffee
Merge branch 'server' of https://github.com/thetmkay/joji into server