Move code from app folder to root
Move res and AndroidManifest.xml to root of project in preparation for Robolectric testing
Change from Action Bar Sherlock to App Compat

Start using Robolectric for testing
Fix SettingsActivity