Map implemented - need to fix HTML display
Google Map implemented
Edited map properties
Current location marker on map
Fixed config.xml, Resized map for mobile device
Removed server file
Increased button sizes
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife

Conflicts:
	index.html
Merge branch 'master' into ari-build_framework

Conflicts:
	js/main.js
	server.js
removed unecessary html file
Aesthetic changes to map view
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife

Conflicts:
	index.html
Merge branch 'master' into ari-build_framework

Conflicts:
	index.html
	js/main.js
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife
Merge branch 'master' into ari-build_framework

Conflicts:
	js/main.js
Error in AngularJS - broken app
Bug in run functions
Squashed one bug, there are still others
Bug in angular..
Squashed all the bugs!