[FIX] Calibration screen not returning to previous screen https://github.com/RasPlex/RasPlex/issues/98
Merge branch 'rasplex-dev' of https://github.com/RasPlex/plex-home-theatre into rasplex-dev