Merge branch 'master' into clientside
Implemented some move features
Merged with nidu's