new version
Merge branch 'master' of https://github.com/UnicornEnergy/Prototype

Conflicts:
	db/schema.rb

Signed-off-by: dzonix <mojicnikola@gmail.com>