Database updated

Signed-off-by: Christian Gläser <glaeser@7says.de>
Merge branch 'master' of https://github.com/UnicornEnergy/Prototype

Conflicts:
	db/schema.rb