Added faker to staging env
Merge branch 'master' into staging