refactored properties classes
Merge branch 'master' of https://github.com/craftworkgames/Astrid.git