update

update
Merge branch 'Java-Code-Convention' of https://github.com/FabioNgo/EstimateProgramResourceUsage into Java-Code-Convention

Conflicts:
	JCC.core/bin/core/JCCHandler.class
	JCC.core/bin/core/checker/Indent.jj
	JCC.core/bin/core/checker/IndentChecker.class
	JCC.core/src/core/JCCHandler.java
	JCC.core/src/core/checker/Indent.jj
	JCC.core/src/core/checker/IndentChecker.java
	JCC.core/src/core/checker/IndentCheckerTokenManager.java
	JCC.core/src/core/checker/WarningSpace.java
	JCC.core/src/core/input.txt