move address to user, nest form, fix upmigrations, change to name from first and list in user
merge with master
Since display_name was removed, call method 'name' on user in events#show
Merge in all_the_changes