Merged osebelin/actionbar
Signed-off-by: Kurt Aaholst <kaaholst@gmail.com>
../commit.msg