is
Merge branch 'master' into development

Conflicts:
	src/com/technocon/mi1000/Test.java