layout diverse jsp's + extra functionaliteit
Merge remote-tracking branch 'origin/master'