Somdip-changed the titles
added icons to /img/maker and changed the map.html a lil bit
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/register.html
Merge remote-tracking branch 'origin/master'