Fixing classes to allow incremental obfustication with proguard
Autocommit Wed Aug 20 11:31:21 EST 2014