Added better flow for editing items
Better logic for editing AYR/ENV entries
Added AYR/ENV choice for all AYR and AYR/ENV members
Merge branch 'master' of heroku.com:epiphany-envelopes

Conflicts:
	.idea/workspace.xml
	app/views/reports/show.html.erb
app/views/reports/show.html.erb