Changed tools-selector
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/test/test.js