Fix #12 and Action Bar: back
Merge branch 'master' of github.com:phimpme/android