modified Application.java
Merge remote-tracking branch 'gcqc/master'