refactor ActionBarActivity, etc
resolve merge
Bug fixes.
Merging master into bug-fixes