11
11
11
11
11
11
11
11
11
11
11
Merge branch 'master' of https://github.com/byakuya6/greenChallenge into develop
Merge branch 'master' into develop

Conflicts:
	build/intermediates/model_data.bin

Project preparation to general update.#
Project ready for upgrading.#
Started unit testing.
Created ElectricDeviceTest, WaterActivityTest, RefuseProductionTest.
UserTest in progress. Started rebuilding architecture by making User class
static.#
Added UserTest. Passing.
Updated architecture - UserStats now a part of User class. Singleton
removed from UserStats, as it is not necessary (it is only reached through
the User class, which is static.)#
Got back to User as Singleton.#
DataSaver and DataLoader changed from Singleton to static classes, as they
are static method packages. Tests for saving and loading files created.
UsageCalculator now a static class (changed from Singleton, as it only
contains methods without state, so now they are treated as a solid static
method package). Added UsageCalculatorTests.#
DataManager now a static class (used as a method package without state).
DataManagerTest created.#