Add property data
Merge branch 'master' of https://github.com/jpount/propertywrap
Merge branch 'master' of https://github.com/jpount/propertywrap
Merge branch 'master' of https://github.com/jpount/propertywrap
Merge branch 'master' of https://github.com/jpount/propertywrap

Conflicts:
	Gemfile.lock
Image controller
Image controller
Image controller
Added error handling
Added error handling
Merge branch 'master' of https://github.com/jpount/propertywrap

Conflicts:
	Gemfile
Merge branch 'master' of https://github.com/jpount/propertywrap