CollectionTime-limit functionality added.
Merge branch 'master' of https://github.com/Scionar/TiPi.git

Conflicts:
	WebContent/resources/styles/style.css
Merge branch 'master' of https://github.com/Scionar/TiPi