Merge remote-tracking branch 'origin/Base' into Sven
Merge branch 'Sven' of https://github.com/ninox92/StudyMap into Sven
Merge remote-tracking branch 'origin/Base' into Sven
facebook login

facebook login only if fb account is added to user
Facebook login finished

You can now link unlink facebook (with facebook id will be changed to
the same option as the login button)
menu dubbel admin verwijderd

nog maar een x admin menu optie, betere foutmelding facebook login.
sql changes
somethings
errmsg
errmsg
errmsg
register
Merge remote-tracking branch 'origin/Base' into Sven
Merge remote-tracking branch 'origin/Sven' into Base