Properties page
Merge branch 'master' of https://github.com/shukkydomes/activecode_property

Conflicts:
	app/views/properties/_form.html.erb