forgot to build js files
Merge branch 'master' into server
checked bug fix before pushing - actually fixed bug this time
Merge branch 'master' into server

Conflicts:
	src/coffee/blog/directives/bloglist.coffee