Complete Tabs funcionality

Complete Tabs funcionality
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	functions.php