Merge branch 'master' into develop
Merge branch 'evie-development' into develop
adds loading image and scripts to static files directory
adds version of tabletop that allows for use of new google spreadsheet
Merge branch 'master' into develop
moves whooping cough dependencies to static-files directory
adds dependencies to static files directory
adds local bootstrap dependencies
moves application wrapper to main static files directory and adds config options file to whooping cough directory
restores previous set up for application wrapper