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

Conflicts:
	views/index.ejs
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
fixed megre issues
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
newest changes