Added GarbagePunishment and fixed problems with java 1.6.
Merged AndroidManifest.xml