new feature file
feature ready
Merge branch 'whowhereFeature'

Conflicts:
	categoryevent.php
	currentevent.php