Bundle update
Merge remote-tracking branch 'oss/master'
Add bibliotech
Merge remote-tracking branch 'oss/master'
Merge TimePulse commit that adds bibliotech
Merged
resolve Merge conflict in gemfile.lock