Merge branch 'master'
fix api doc
update readme
update doc
Merge pull request #5 from worldintime/iba_42_swagger_docs

Iba 42 swagger docs
add tests
Resolve merge conflicts
Resolve merge conflicts
Basic push notifications
add tests
Merge branch 'push_notifications'
code update
Merge branch 'add_tests'
fix route
fix schema; update tests; update api doc
Fix push notifications
rating page functionality
Merge branch 'master' into messagin_tool
canned statement functionality
fix gemfile