What I do editted
Merge branch 'master' of https://github.com/Daramkun/ProjectLiqueur

Conflicts:
	ProjectLiqueur.userprefs