Database cleanup

- I removed the upgrade version 5 because it is the same as upgrade 6. This will reduce some unnecessary upgrades.

- Downgrade version 7 to 6 (last released version in the store is 5)

TESTED: AVD  Android:2.2 Running 1.3.1
Result: Upgrade went well.