Alert Resetting
Merge branch 'master' of https://github.com/tharianjk/FieldServer

Conflicts:
	.cproject
	Debug/config.JSON