new jquery
Merge branch 'master' of https://github.com/beesandtrees/mkmBasic

Conflicts:
	index.php