Caching
Merge branch 'cache' into hackathon

Conflicts:
	app/index.html
	app/scripts/controllers/graph_ctrl.js
	app/scripts/services/db_curl.js
	app/views/graph.html
finished cooccurrence matrix
- new color scale based on 0.25
- move to the selected day directly
Merge branch 'cooccurrence' into ui

Conflicts:
	app/index.html
	app/scripts/controllers/graph_ctrl.js
	app/views/graph.html
Merge branch 'hackathon-bahia' into ui
Merge branch 'ui' into cooccurrence

Conflicts:
	app/index.html
	app/scripts/controllers/graph_ctrl.js
	app/views/graph.html
colors fixed
Merge branch 'hackathon-bahia' of https://github.com/karimAlaa/viz into hackathon-bahia

# By Ahmed Ali
# Via Ahmed Ali
* 'hackathon-bahia' of https://github.com/karimAlaa/viz:
  - new color scale based on 0.25 - move to the selected day directly
  - fix '<<' move
- add the matrix by a naive way,
changed security icon and added tooltip
Merge branch 'cooccurrence' into ui

Conflicts:
	app/index.html
	app/scripts/controllers/graph_ctrl.js
	app/views/graph.html
Merge branch 'hackathon-bahia' into ui

Conflicts:
	app/scripts/directives/heatmaps.js
Co-occurrence Matrix modal
UI fix