Verify branch integrity
Merge branch 'Hubert'
Fixed super ultra wierd router problem
Merge branch 'Hubert'
Merge branch 'master' into Hubert