gmap added to several pages
more maps and some corrections. database updated.
conflicts removed

Conflicts:
	db.sqlite3
	shops/models.pyc
	shops/urls.pyc
	shops/views.pyc
	users/urls.pyc
	users/views.py
	users/views.pyc