removed actionbarsherlock (tab implemented with tabhost, tabwidget, and fragments)
merged conflict files and added tab icon images