- corrections to cube question and others
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vault/2-h3l-9v5t6/question.tex
	vault/2-h53-mvg83/question.tex
	vault/2-h53-mvgt4/question.tex
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vault/2-h3l-9v5t6/question.tex
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
- altered script to reflect ScanbotSS changes
- new backup folder for incoming scans
- unresolved scans will all sit in scantray now, this folder no longer needed
Merge pull request #465 from adamarla/master

Scanbot and bank structure changes