before merging actionbar fix with master