Merge branch 'sqlalchemy' of ssh://git.onelab.eu/git/sfa into sqlalchemy