repair problems associated with editing a sample, editing a user-submitted library, and creating and editing a facility-generated library. Appears to behave now. (problems were due to removing @Transactional on the SampleDNAToLibraryController and to a change Andy made (refresh) in the WASPDao base class - save method.
merge with master following repair of conflicts
display of software info now visible. but need to rework samplepairs
resolved conflicts and commit
Merge branch 'master' into addAnalysisPage
Added new Analyis channel
Added ability to retrieve plugin by name
improved waspPlugin area handling logic
improved batch job getter logic
fixed null pointer exception when editing a sampleDraft during job submission. Also fixed job.getSample() to go through the jobsample table rather than using sample.submitter_jobid (which actually precludes samples being on multiple jobs.
start at saving proper id values with sample pairs
fix stubsampleservice
fix daemon stub
Major refactor of meta so that it is possible to save meta generically
and more easily
fixed broken test
fixed
Merge branch 'master' into samplePairs
now searching for method names and fields is case sensitive in case of
dodgy camel-casing
Merge branch 'master' of http://frankfurt.aecom.yu.edu/git/wasp/rob

Fixed Conflicts:
	wasp-core/src/main/java/edu/yu/einstein/wasp/service/impl/SampleServiceImpl.java
	wasp-web/src/main/java/edu/yu/einstein/wasp/controller/SampleDnaToLibraryController.java
fixed tests broken by Rob's updates to Job table for getting samples