Updated version number to 7 (2.2)
Merge branch 'dev' of https://github.com/davidofwatkins/ccshuttletracker into dev