review analysis
Merge branch 'develop'

Conflicts:
	analysis/NewAnalysis.java