commit from linux
after the change
Merge branch 'master' of github.com:prosseek/contextAggregator

Conflicts:
	aggregation_analyzer/test/test_size_disconnection.py
Just do it.