Merge branch 'hot_feature'

Conflicts:
	dummy.project/src/test/pack/Test1.java
modified
opiopiopiopi
Merge branch 'tw'

Conflicts:
	dummy.project/src/test/pack/Test2.java