add xui
add js
update
add nav-tree
add notify
Merge branch 'master' of https://github.com/zzz1985xxxwl/xui

Conflicts:
	Gruntfile.js