Removed unnecessary example
Merge dev's tabs into master