my config (aaguiar)
Merge branch 'master' of https://github.com/mario-figueira/timetochange__compaigns

Conflicts:
	config/sysvars.php
Merge branch 'master' of https://github.com/mario-figueira/timetochange__compaigns
sysvars deleted
Merge branch 'master' of https://github.com/mario-figueira/timetochange__compaigns