Fixed address form layout
Merge peer4commit/master

Conflicts:
	app/views/users/show.html.haml