.
Merge branch 'master' of github.com:nivdul/jecode

Conflicts:
	resources/public/md/ludwine.probst