change application_root
change folders
Merge branch 'master' into develop