modified some files in app/
Merge remote-tracking branch 'gcqc/master'