edit gemfile to rails 4.0.4
Merge branch 'create_problem' into develop
fix merge from create_problem
fix infoWindow on problems index
fix blank-avatar
Merge branch 'master' into develop