changes to functions.php
Merge branch 'master' of https://github.com/fusionPT/facturame

Conflicts:
	js/app-ck.js