Cleaned up JSON element names so they we will work with PHP and MYSQL easily.
Merge branch 'master' of github.com:gb2002/ExceptTrack