Merge branch 'master' of github.com:vvdt/jquery-tagbox

Signed-off-by: Vincent van den Tol <vincent@newsportsolutions.nl>

Conflicts:
	js/jquery.tagbox.js
Merge branch 'master' of github.com:vvdt/jquery-tagbox