Merge branch 'hotfix/release-1.5'
Merge branch 'release/release-2'
Updated release 2 notes
Re-exported fsp_structure feature to get around being unable to revert on dev
Update function to delete phone field
Fixed syntax error in update function
Added permissions for membership profile
Merge branch 'master' of github.com:fspadmin/fsp-new