Card #48 Added saving of User Features.
Merge remote-tracking branch 'origin/develop' into develop