fix buttons, map fills screen
Merge branch 'master' into feature/map_fix
backend sends the names of the API categories to the front end
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
methods in home.js to get the data send from the server through the template engine
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
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
Parsing of police and police categories completed
Housekeeping
MErged with the map updates
Map is working
/js/control.js - attach listeners to the checkboxes next to the data categories on the right panel. When clicked, the layer with corresponding on the data type clicked, is visualised on the map. The event handler also checks if the data has expired(using timestamp)
sets the default data to be shown to Police
/js/data_process.js - sets the timestamp of the layer, when updating its content
Merge branch 'feature/implement_server_side' of https://github.com/cloudcomputingproject/main_repo into feature/implement_server_side

Conflicts:
	application/controller/controller.py
	application/static/js/controls.js