install bugs fixing
Merge remote-tracking branch 'origin/uk_trials' into uk_trials

Conflicts:
	mod/z02_clipit_api/views/default/data_input.php
install bugs fixing