small clean up for sync
Added ImageJ plugins
Merge branch 'master' of https://github.com/mrpurplenz/NZ-LASRA

Conflicts:
	Unsteady state heat transfer/php/table_display.php