modify some styles
Merge branch 'master' of https://github.com/HCI-webdesigner/GPDI
modify some files
deal with the conflic