ihwy?
Merge branch 'master' of github.com:prosseek/contextAggregator

Conflicts:
	aggregation_analyzer/aggregation_analyzer/multiple_runner.py