changes in Application.class
Merge branch 'development'