Bring tabControl back (new design - tabControl)
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/apps/merchant/routes/multiRoutes.coffee