Clean up settings. Add dependency to make it work after merge
Commit before merging
Fix merge conflicts before merge
Merge remote-tracking branch 'upstream/master' into Feature-cleanUpSettings

Merging fixed backend to local repository
Merge remote-tracking branch 'upstream/master' into Feature-cleanUpSettings

Trying to merge with fixed backend
Fix userEmail/userProfile problem. Fix sending object for border corners. Fix login problem with new server configuration. Fix verification page not closing automatically. Clean up code a bit
Merge pull request #81 from gorlanwix/Feature-cleanUpSettings

Clean up settings. Add dependency to make it work after merge