Modify to use ActionBarActivity instead of ActionBarSherlock
Merge branch 'develop'