Added tabs permission
Merging "testbranch" into master for testing purposes