workig on admin panel
Merge branch 'master' of github.com:lingz/wellSense
most of code
Merge branch 'master' of github.com:lingz/wellSense

Conflicts:
	client/views/graph/graph.html
	client/views/graph/graph.js
	server/fixtures.js