if KitKat proxy code doesn't work, try ICS (for cyanogen)
small cleanup of imports
new submodules
Merge branch 'bug_reset_kitkat'