Update to network to change type upon loading edit form and update to timeglider to try and fix description bug
Updating master of SHIVA to Bill's latest