update Application.java
Merge branch 'develop'