Including address to resources form
Adjust in User model
Editing resources
Merge branch 'master' into edit_resources

Conflicts:
	app/views/resources/_form.html.haml
Improving views
Merge pull request #59 from rhokbrisbane/edit_resources

Resources with address