reorder jquery & prototype to fix tabstrip.js error
Merge branch 'master' of github.com:BJMDesign/DataObjectManager

Conflicts:
	code/DataObjectManager.php