minor updates
Merge branch 'master' of https://github.com/Catpaw42/Area51.git

Conflicts:
	project/51_02324_F14/D2/javaMeasure/control/interfaces/IDatabaseController.java
Merge branch 'master' of https://github.com/Catpaw42/Area51.git