no message
Revert "no message"

This reverts commit b28a192d1e72df400e50bb73962655bda876f99b.
fdf
Merge branch 'master' of https://github.com/Foboy/GoGoTown

Conflicts:
	trunk/crm/application/config/config.php