New activity for Tab testing
Merge conflicts… foo
Removed tab testing from develop branch
Added some icons