prop changes
new host for eduan
Merge branch 'master' into mac