First working Calendar implementation of Wifi Profiles
Merged fix