Fixed the shortest path bug and some misc. graphical bugs
Merge remote-tracking branch 'origin/master'