Fix typo
Merge branch 'develop' of http://github.com/dixte/dixte into develop
Rename property tracker method from add to put
Add trackProperties and some javadoc to PropertyTracker. Need to test it