rest service
Merge branch 'master' of https://github.com/auditoriumCS/auditorium
JSON push api
Merge branch 'master' of https://github.com/auditoriumCS/auditorium
JSON push api - done
Merge branch 'master' of https://github.com/auditoriumCS/auditorium