implement new features
implement new features
Merge branch 'master' of https://github.com/p1tz/rike

Conflicts:
	arago-rike/src/main/webapp/html/task/jsp/defaultView.jsp