Merge branch '1.5.1-buildprocess' into develop

Pulling in new build process hotfix.
Merge branch 'hotfix-1.5.2' into develop

Merging in hotfix.
Merge branch 'master' into develop

Merging in some very new hotfixes.
Big 'ol change with migration to Express 3.x.
Cleaning out some unnecessary files.
Moving to jPlayer 2.3.0.
Finalizing playlist functionality. Better styling to come.
Finalizing playlist functionality and centering for big screens.
Merge branch 'playlist' into develop

This merge incorporates playlist functionality, plus some new styling.
Bumping version numbers.
Merge branch 'develop'

Merging in the development branch, which brings us to version 2.0.0!