Fix for ssl double-login issue on demo site
Fix for item extended price if price is nil
Merge branch 'master' of https://github.com/suegrimes/seqLIMS.git

Conflicts:
	app/models/item.rb
Use ssl gem only in production; Minor formatting for items