small fixes
merge fix
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
fixed junctions to correctly work when entering from all directions
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14