Changed Method
Merge branch 'N_branch'

Conflicts:
	source/sysAnalysis/Test1.java