Signed-off-by: Lois47 <collet.lois@gmail.com>
Merge branch 'master' of https://github.com/kazamafury/ter

Conflicts:
	src/m2dl/ter/mobadict/Tranquil.java
Merge branch 'master' of https://github.com/kazamafury/ter