added Gemfile.server
Merge remote-tracking branch 'origin/feature/ifa' into feature/ifa
cleanup