Merge branch 'master' of C:\Users\Håkon\Dropbox\IntelliJ\calender with conflicts.
Merge remote-tracking branch 'origin/master'
#12

Filled in loginview
Merge pull request #13 from chunfantasy/LoginView

LoginView