Merge commit 'b64e9770359aa1b3ee041650dac0c72272a7020a'
Merge commit '5a93eb08fa4260fd28a562ae845568d30721c3dc'
changes to get things working on barcrawls
fix video embed
Merge pull request #88 from joshh/master

SEO changed for barcrawls
fix mistake in getList pagination. not sure how this ever worked as it is
update slideshow to work with new vf
switched back to the way it was.
Merge pull request #89 from joshh/master

Fix pagination and change the slideshow to work with new vf
ability to refresh vf folder
Merge pull request #90 from will123195/master

refresh vfolder
reduce 15s vf timeout to 150ms
Merge pull request #91 from will123195/master

faster timeout when vf is down or slow
increase the vf timeout to 500ms
Merge pull request #92 from will123195/master

vf timeout adjustment
vf timeout increase to 1500ms
Merge pull request #93 from will123195/master

increase to 1500ms
3s timeout
Merge pull request #94 from will123195/master

temporary fix -- set vf timeout to 3s
Merge remote-tracking branch 'upstream/master' into v3-beta