checkin of changes over last year
Merge branch 'master' of https://github.com/smeighan/nutcracker

Conflicts:
	effects/f_single_strand.php
	project/project.php
corrected some formatting