properties to config
Merge origin/master