small change
added figaro for YAML app config
merged conflict from develop
re-adding identities model and controller