Description changed
Merge github.com:ykang/EventDetection

Conflicts:
	DESCRIPTION