merged changes from master
Removed Gemfile.lock which causes problems
Removed Gemfile.lock from repo
Added installation information for IT2
Fixed typo in documentation.
Merge commit '48ea6a1' (feature-scoop-it2) into tempit5