updated API and index to be more like paper prototype
Merge branch 'master' of https://github.com/eTendance/main