fixed Kristians DBController error....
finished login
Merge branch 'origin/master'