Remove validates-timeliness plugin (using gem instead)
add debug info for versions, branch
add constant to disply git branch
rem gemfile.lock
add files to ignore: gemfile.lock, .project
mods to jquery usage
mods to jquery usage
comment out jquery migrate
put back jquery migrate line
adjust path for images
Annotate models; remove unnecessary plugins
Merge branch 'r3_upgrade' of https://github.com/suegrimes/seqLIMS.git into r3_upgrade_sue

Conflicts:
	Gemfile.lock