24-12-2014 EMG Push

*Emergency bug fixes to fix critical bugs