added www to test cors on phone gap app
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/surfjedi/trakl
Merge branch 'master' of https://github.com/surfjedi/trakl
changed to five minutes
changed the esther web app from www to esther_webapp folder in publc
added onsen web app to esther_webapp folder, changed traffic polling to ten minutes
Merge branch 'master' of https://github.com/surfjedi/trakl