style mod1
merge
Merge branch 'AngularDev' of https://github.com/gb2b/ProjectAres into AngularDev
change menu