Added properties dialog
Merge branch 'develop'