Changelog 23/05/14:
- Added the SEARCH function
- Modified some layouts
Merge branch 'albertj'
Resolved conflicts.
Conflicts:
	ClubBiz/app/controllers/events_controller.rb
	ClubBiz/app/views/events/show.html.erb