delete the useless mapping.
Resolve conflict
Move notification to admin_event
Merge branch 'rails_girl' of github.com:ymzg/ymzg into rails_girl

Conflicts:
	Gemfile