Docs
Merge branch 'master' of github.com:lopis/colme

Conflicts:
	js/jquery.colme.js