Formating Files
Merge branch 'dev'