update
Merge branch 'local'
more things
Merge remote-tracking branch 'origin/master'
Merge branch 'local'
Merge remote-tracking branch 'origin/master'
Close and change route functionality, slightly modified message of
Status