moving to a /route
Merge branch 'master' of https://github.com/chinab91/micecolab
meetings json endpoint completed (data needs to be changed)
Merge branch 'master' of https://github.com/chinab91/micecolab

Conflicts:
	app/views/general.py
Merge branch 'master' of https://github.com/chinab91/micecolab