added Roomfinder functionality
Merge remote-tracking branch 'origin/master' into TCA-Team
Merged master with TCA-Team