Merge pull request #118 from angelxmoreno/fix_appuses_email

Moved "App::uses('CakeEmail', 'Network/Email')" to top of USersController
Merge remote-tracking branch 'upstream/develop' into cakeproject