...
Merge branch 'master' of https://github.com/tavioto/crmapp

Conflicts:
	inc/footer.php