Force use of ActionBarActivity, will break build!
Merge remote-tracking branch 'origin/master'