Edit Group Modal
Merge branch 'master' of https://github.com/IvenZ/awesome.git

Conflicts:
	app/assets/javascripts/ajax.js