Add properties and dependent models pre-migration
Add properties, change colors, add markercluster and Twitter bootstrap
Merge branch 'properties' into develop
Merge branch 'develop'