sql maj
Merge branch 'master' of https://github.com/griloox/AppliStage

Conflicts:
	sql/base.sql