Fixed issue with activity filter
Fixed conflict
Merge branch 'master' of
https://github.com/HoldingConsultants/improtools

Conflicts:
	protected/views/estrategies/_activitySearch.php
	protected/views/estrategies/view.php