ecoinizer merge
Merge branch 'master' of https://github.com/Team-Saucisse/EnergyHack

Conflicts:
	TheSaucisseFactory/TheSaucisseFactory.Ecoinizer/MainWindow.xaml.cs
	TheSaucisseFactory/TheSaucisseFactory.Model/TheSaucisseFactory.build.xml