Merge pull request #26 from liugc/master

nothing large
modified some files in app/
Merge remote-tracking branch 'gcqc/master'
Merge pull request #27 from liugc/master

m
l