Moved properties file to own folder
Merge branch 'master' into Exported