Merge pull request #20 from liugc/master

nothing
modified some app/
Merge remote-tracking branch 'gcqc/master'
modified some app/
Merge pull request #21 from liugc/master

nothingl
modified Application.java
noyes