VC now points to correct URL from drop-down-menu.
Merge branch 'feature/drop-down-menu' into release/1.2.1-cardiff

Conflicts:
	protected/views/base/_form.php
Changed time to look for imported VFA files from 1 hour to 1 minute.
Merge branch 'feature/rest_scanned_document' into release/1.2.1-cardiff