Recovering after git fuckup!
Merge branch 'develop' of https://github.com/2RSoftworks/ReePassBackend into develop

Conflicts:
	JavaWrap/bin/reepass.rb
	JavaWrap/bin/reepass/models/encryption_models.rb