property additions
detailed gui finished
Merge branch 'refs/heads/dev'