Added api key to configuration key
 Cambios para hacer commit:
	modificado: application/config/rest.php
	modificado: application/modules/api/controllers/ebreescool_api_test.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/config/rest.php
merge