pull update
Merge branch 'master' of https://github.com/pionites89/EMIS

Conflicts:
	content/troubleshoot/troubleshootContent.php
	files/classes/function.php