cache
Merge branch 'master' of https://github.com/niuskamora/SHSDC

Conflicts:
	cache/wsdlcache-aeb8907dcd50bd904dd4f257171e5460

	modified:   ajax/bandejas.php
	modified:   cache/wsdlcache-aeb8907dcd50bd904dd4f257171e5460
	modified:   pages/inbox.php