Update the map with marker from the api
Move back to bootstrap 2.3.1

Conflicts:
	app/index.html
Update component.json to bower.json
Update ruby version