Merge branch 'development' of https://github.com/caprice/infobus.git
into development
Merge branch 'development' of https://github.com/caprice/infobus.git into development