Daily commit
Merge branch 'master' of https://github.com/qpiny/CryoVault.git

Conflicts:
	.gitignore
	src/main/scala/org/rejna/cryo/models/Archive.scala
	src/main/scala/org/rejna/cryo/web/CryoSocket.scala
	src/main/scala/org/rejna/cryo/web/Event.scala