initial commit
Merge branch 'master' into menu_expmts
client can move units, server updates