things
erge branch 'master' of https://github.com/LabAdvComp/Bionimbus

Conflicts:
	databases/bb23946aa32d79ac0766d12f23518c8f_t_experiment_unit.table
	databases/sql.log
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus
send mail
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus
fixed html, other small html formatting bugs
foo foo foo