updated sqlite3 gem
no need for the project_institutions list to have a max-height and scroll overflow - SYSMO-1561
skip jws tests when running with travis
reading and parsing the biosamples treatment info from the raw template
resolve projects, assays, datafiles, contributors, sops to activerecord items, and replace in the hash
started tying things together ready to be inserted into the db
Merge remote-tracking branch 'origin/master' into stuzart/master
run full suite of tests, but just with ruby 2.1.2 (we will have another branch for comprehensive testing)
cleaned up the model extraction code a little
consolidated and simplified genotype and phenotype handling into its own module, reducing some duplication
moved get_all_as_json up to acts_as_asset since the method is the same across all assets
fix to page title for Programmes
reverted sunspot gem back to 2.1.0 - SYSMO-1570
Backed out changeset ae7a71aecfc4
Didn't solve problem. Will put back to latest version and rebuild index entirely with the newer gem.
SYSMO-1570
temporarily don't put the reindexing job back on the queye when it fails - SYSMO-1571
updated exception nofication to the latest version
updated Exception notification initialisation code for newer gem, and updated reindexing job to send notification email - SYSMO-1571 SYSMO-1570
some tidying up of associate organism and strain  with assay
update tags
Merged latest from 0.21 mercurial

Conflicts:
	.hgtags