Merge branch 'develop'
Merge branch 'develop'
fix for blank quote cards
increase time before checking for errors
fix for broken github footer link
Merge branch 'master' into develop