Moving to server side data pull
Modified for server side
Merge branch 'master' of https://github.com/eswaraj/platform
Merge branch 'master' of https://github.com/eswaraj/platform