add some function
Resolve the conflict
add some function about alert
Merge branch 'meteorite' into meteorite-nj005
lose some file
complete Permission
complete Log4js
add and edit function of alert
Add the editor clew
Report types associated with the weekly deadline
add and edit SoundAlert module
complete equioments enabled and and forbid
merge nj04
Merge branch 'meteorite-nj003' into meteorite
Merge branch 'meteorite-nj005' into meteorite
merge hu
modify svapi.ini