Merge branch 'develop'
Added support for University Health Service - Internet Booking System
Merge branch 'master' of https://github.com/TangRufus/LazyCUHK
Merge branch 'master' into uhs-support

Conflicts:
	manifest.json
Merge branch 'b123400-uhs-support'
upgraded to v7.0.0 - support UHS