Removed getfriex.php, moved it to 'friex_development' branch
Merge branch 'master' into firex_development

Conflicts:
	application/controllers/getfriex.php