[master] sample2 commit
[iss53] Sample.java modified
[master] Sample2 modified
Merge branch 'ISS53'
[iaa53] Sample.java
[master] Sample.java
Merge branch 'iaa53'

Conflicts:
	src/branch/Sample.java