Merge origin/master

Conflicts:
	resources/META-INF/MANIFEST.MF
Merge origin/master
Deleted Test function, and put correct code in testPeriodic.