add action bar sherlock
merge conflict