Removed dump.rdb
Handled Merge conflict
Added new template files for the property presentation
Added new template files for the property presentation