Port to Java 6
Merge branch 'master' of github.com:ai14/prosammgen

Conflicts:
	src/main/java/com/github/ai14/prosammgen/WAnalyzerS.java