changes to the Gemfile
 Changes Gemfile versions, merges conflicts and changes from github
performs Internationlization in English, may be extended for other langugaes, removes a few bugs
conflicts resolved
minor modification in en.yml file