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

Conflicts:
	app/assets/images/.DS_Store
	app/assets/javascripts/.DS_Store