Fixed merge stuff
Instance stuff and login data gets encrypted now
Finishing up...
Merge pull request #115 from Northcode/dev-Jens

Dev jens
merge with dev