Uptodate
Merge branch '1.0' of https://github.com/abrar40/BeatingHome into 1.0

Conflicts:
	resources/flEnvironments.txt