develop commit
Merge branch 'master' of https://github.com/Enkows/lifaner

Conflicts:
	application/controllers/admin.coffee
	application/views/admin/post/new.html
	boxx/index.coffee