Merge branch 'master' of https://github.com/smashingboxes/GUC into targetsAndAlarms