Updated gemfile.lock
Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'master' of github.com:expertiza/expertiza
Changed the grant_expertiza.sql script to  exclude drop user