Minor changes in UI
End of day code push!
Merge remote-tracking branch 'origin/Divi-2'

Conflicts:
	_css/main.css
	_js/db-operations.js
	_js/map.js
	_js/user-operations.js
Merge remote-tracking branch 'origin/master' into Hassan

Conflicts:
	_js/map.js
	_js/objects.js