Fixed merge conflicts
Merge branch 'master' of github.com:mariposacoop/IS4C

Conflicts:
	pos/fannie/mess_auth/permissions.php
Made sure Fannie header is always just "Fannie"