Misc Updates
Setup production environment
Merge branch 'development' into staging