changed ActionBarActivity to Activity
Merge branch 'master' of github.com:okal/jau