Merge commit 'b21e8b2af3594286d6a8ece7bdd11bda6cedfbfb'

Conflicts:
	libsmo/include/user_course.hpp
Added a bit new API that I found will be needed, some work on making smo-gtk use the SQL backend