Fungerande version utan att user sparas
Merge branch 'development' of github-rickardz:rickardz/SchemeApp into development