+doc
Merge remote-tracking branch 'origin/develop'

Conflicts:
	src/artiano/uiTest/test/Test.java