map js refactoring
Merge branch 'master' of https://github.com/shirasagi/shirasagi

Conflicts:
	app/models/cms/group.rb