refactor ActionBarActivity, etc
resolve merge