added background to maptools
Merge branch 'master' of github.com:tomarcafe/tzm-blade into angelo

Conflicts:
	app/controllers/map.coffee
zmgc.net domain now functioning
Updating styling of Admin User List interface

#41
Merge remote-tracking branch 'upstream/master'
update french locale
Merge branch 'mdm' into angelo
Merge branch 'angelo'