fixed merge issue
Merge branch 'develop' into staging
trying to fix merge issue on media quotes
Merge branch 'develop' into staging
Merge branch 'staging'
Merge branch 'develop' into staging
Merge branch 'staging'
Merge branch 'develop'
Merge branch 'develop' into staging
Merge branch 'staging'
Merge branch 'develop' into staging
Merge branch 'staging'
fix
test
Merge branch 'staging'

Conflicts:
	views/index.ejs
Merge branch 'develop' into staging
Merge branch 'staging'
Merge branch 'develop' into staging
Merge branch 'staging'
Merge branch 'develop' into staging