Updating
Merge branch 'master' into development

Conflicts:
	db/schema.rb
Fixing schema.rb
Sync dev with master changes
3/15 Daily
Release 2 Sprint 1
Merge pull request #40 from LIMSforge/development

Merge Development Into Master