temp
temp
Merge branch 'master' of https://github.com/easyblog/easyblog.github.io

Conflicts:
	_src/coffee/app.controllers.coffee