added edit forms
Merge branch 'steve' of github.com:stevemcquaid/cmunity
design changes
Merge branch 'master' into sean

Conflicts:
	app/views/groups/show.html.erb
resolved merge conflicts