Merge branch 'gsm_interface_cleanup'
Merge branch 'master' of https://github.com/SeniorDesign2014/MainFirmware