Merge

<
Merge branch 'master' of github.com:CreativeMobile/socmap-dfl

Conflicts:
	.DS_Store
	log/development.log