Cleanining up features
Merge pull request #13 from taiyode/anchen

Cleanining up features
Merge branch 'sharsa'
Resolved conflict in notification index
Conflicts:
	ClubBiz/app/views/notifications/index.html.erb