Merge branch 'dev'

Conflicts:
	src/com/lesson/Main.java
	src/com/lesson3/ui/message/IOnStringInput.java