changes
Merge branch 'master' of git://github.com/isenseDev/rSENSE into collapseBox
working on users page
Merge branch 'master' of git://github.com/isenseDev/rSENSE into ExperimentTemplate
merge of evanas stuff
Merge branch 'master' of git://github.com/isenseDev/rSENSE
Initial changes for real field matching
Adding jquery form plugin
Fixing a merge conflict with hassan
fixing yet another merge conflict
Setting up column matching
Merge branch 'field_matching' of git://github.com/jdalphon/rSENSE into uploadModal
more column matching (adding back save to mongo_
WIP commit on field matching dialog.
-Can drag fields around, but they get a wierd position for some reason.
-Currently no bounds checking (one header per field).
more changes for field matching
-Added $.errorFlash jquery call for consistant error flashing.
-Fixed some login css, and had it use the new error flash.
=Created a basic field matching gui (dropdowns).
Merge branch 'field_matching' of git://github.com/jdalphon/rSENSE into uploadModal

Conflicts:
	app/assets/javascripts/experiments.js.coffee
-Added js file for uploadModal that I forgot.
-added redirect back in.
-Field matching works!
-Added case to catch lack of partial matches.
-Fixed the order of previous commit if.