add ROOT_PATH to Shapes module
resolve merge conflict
add cross-origin gem to enable CORS requrests
Merge branch 'master' of github.com:mjprude/mta_realtime