Merge branch 'test' of https://github.com/agassis/ACliets into test
no message
Merge branch 'test'

Conflicts:
	build-ACliets-Desktop_Qt_5_3_MinGW_32bit-Debug/debug/ACliets.exe