Yesterdays changes
Merge branch 'sobu-nilu' of https://github.com/StevenHouben/SmartWard into sobu-nilu
Fixed small bugs