[TASK] Merge changes from typo3camp rheinruhr implementation

Change-Id: I287f7921510a35d222f454350412bbb1948996ca
Reviewed-on: http://review.typo3.org/33834
Reviewed-by: Sebastian Fischer <typo3@evoweb.de>
Tested-by: Sebastian Fischer <typo3@evoweb.de>
[TASK] Add new files from merge

Change-Id: Id6e55aa06e359833ec9bc49ac5fc98b6b784fd7e
Reviewed-on: http://review.typo3.org/33835
Reviewed-by: Sebastian Fischer <typo3@evoweb.de>
Tested-by: Sebastian Fischer <typo3@evoweb.de>