tab.js
Merge branch 'develop'

Conflicts:
	mynewtemplate/index.php