merged nik/master
Merge branch 'master' into actionbar
merged nik/actionbar
merged nik/actionbar
Merge commit 'dffffbd449733708d3d64db6688050bcfa5d354c' into actionbar