Application general configuration file
Merge branch 'dev'