cytometers module still buggy [fixresources branch]
cytometers module still buggy [fixresources branch]
fred has cytometer form and display and panel display
Merge branch 'master' of github.com:treestarinc/george

Conflicts:
	application/modules/membership/models/resources_m.php
merged fred into master
update git ignore
manually added fred/views
Merge branch 'master' of github.com:treestarinc/george
Merge branch 'dashboard_gui'

Initial Dashboard Gui "Joe"  Merge into George.
cytometers $resource_id changed as per Matt
changed route to fluorish_gui
jquery.miniColors corrected
no message