Revert "Merged ashish branch"

Reverts DevelopFreedom/logmein-android#17
Sorry for this mess up.