Move properties files to resource's place
Merge remote-tracking branch 'origin/develop' into local_develop
some improves