rename BaseActionBarActivity to AutoLockActionBarActivity.
Merge remote-tracking branch 'origin/master'