[LQMM-3.1] Commit
Merge branch 'LQMM-3.1' into LQMM-3

Conflicts solved:
	src/com/painting/Test.java