creating APIs branch
fix buttons, map fills screen
Merge branch 'master' into feature/map_fix
Minor fixes, started developing the layers
Merge branch 'develop' of https://github.com/cloudcomputingproject/main_repo into feature/implement_server_side

George has commited server requestto get categories
map fills screen, bugs fixed
Circle colour for each type and changing radius
fixed layers
Merge branch 'feature/implement_server_side' of https://github.com/cloudcomputingproject/main_repo into feature/implement_server_side

Conflicts:
	application/static/js/home.js
food agency
Fixed George's merge
initial work on the Control layer panel on the right side of the map.
Merge branch 'feature/implement_server_side' of https://github.com/cloudcomputingproject/main_repo into feature/implement_server_side

Conflicts:
	application/static/js/home.js
home.py depends on the parser module to get the police categories
Parsing police categories
29.11.2014
29.11.2014
merged geoCoding and geoJSON objects. Function handleAllDataReq does all handling.
Parsing of police and police categories completed
Housekeeping