asdg
fixed conflict
working on put
sdf
sadg
working on put...
sdf
merge
working on services
Merge branch 'ari-mapdesign' of https://github.com/arikalfus/OperationNightlife into burak_design
service
Merge branch 'master' into burak_design
added the group interface and navigation bar
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife
sdg
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife

Conflicts:
	server.js
Fixing merge