committing collectorAlignment revisions
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014

Conflicts:
	trunk/Software/linux/modules/Collection/collectorAlignment.c