Merge remote branch 'origin/develop' into qa
Merge remote branch 'origin/release' into qa
perf-improve: speed up query
getting ready for comp recordings from develop
Merge remote branch 'origin/develop' into qa
Merge remote branch 'origin/release' into qa
Replacing .htaccess file with .htaccess.sample
expose .htaccess to git

exposed .htaccess to git and use an
unexposed .htaccess.sample to reference when
setting up an installation
deleting .htaccess

- shouldnt be in repo, its CLSA specific
bug-fix: get_next_participant malformed sql

- the sql to get the next available participant was malformed
- use temporary tables to simplify the process and correct
  the use of the left join to the assignment table
remove db debug
Merge remote branch 'origin/release' into qa

Conflicts:
	api/database/assignment.class.php
	web/.gitignore
bug-fix: deferred status

- fix resolved status handlins
- fix use of twig var in string comparisons
bug-fix

- misuse of needle/haystack args in strpos calls
- use strpos instead of preg_match : performance
bug-fix: pendings not showing in assginment list

- fix modifiers when locating typist test_entrys to determine
  allow transcription
- fix modifiers when determining typists assignment list to show
  assignments containing pending test_entrys
bug-fix: assignment list sort on cohort name

- sorting on cohort name required cenozo code to allow
  joins via modifiers
Merge remote branch 'origin/qa' into release
bug-fix: bad return check

- check against false on current() checks, not  is_null()
bug-fix: remove throw exception

- see last bug-fix commit
Merge remote branch 'origin/release' into develop