fix
Merge branch 'master' of https://github.com/aduermael/dockerblog

Conflicts:
	app/srv/modules/posts.js