On branch master
 Changes to be committed: abstract fragment code from layout xml.
Merge branch 'master' into dev-compat-actionbar