fixed merge
Merge branch 'master' of https://github.com/cosmin1123/Panic-Helper
sending sms added
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ninja/PanicHelper/safetyMeasures/MainAlarm.java