Merge branch 'tokenList'

Conflicts:
	resource/flandre.png
	src/QTSFML/Map.cpp
	src/QTSFML/Map.h
	src/QTSFML/SpriteList.cpp
	src/jdrnix.pro
	src/mainwindow.cpp