This is the branch to work on mostly. Have forked a new branch to fix action bar bug later on.