Merge branch 'master' into development
Rename custom appliation class to ExtApplication
Merge branch 'development'
tidying