-updating actionbar to latest support jar
-fixing merge issue
Merge remote-tracking branch 'refs/remotes/origin/master'