merging
Merge branch 'master' of https://github.com/sschloesser/tabManager

Conflicts:
	js/tabber.js