Updated file location
Merge branch 'master' of https://github.com/jkale/FP-Members

Conflicts:
	classes/class.role-editor.php