Merge branch 'master' of https://github.com/conchrist/dogma
Merge branch 'master' of https://github.com/conchrist/dogma
Handle sessions on client
Merge branch 'master' of https://github.com/conchrist/dogma

Conflicts:
	prepare.sh