Updating app name to OpenBike across files.
Fixing merge conflict
Removing local .jar file