a
Merge branch 'requirejs_dev' of https://github.com/openjavascript/jquerycomps into requirejs_dev

Conflicts:
	modules/JC.AjaxTree/0.1/res/default/style.css