#73 using ActionBarActivity
merge error