added .rvmrc file to .gitignore
CDB-1100 #first-step - sync now behaviour almost done
CDB-1100 #failure-case - prevents synchronization fails
CDB-1100 #better-failure - synchronization error better explained
buttons at dark infowindow fixed
sprite re-generated
tests added
update map when sync is finished
Merge branch 'CDB-2757' into CDB-1100

Conflicts:
	.gitignore
	app/assets/images/sprites/map-s5fc267c10c.png
CDB-1100 Endpoints for sync now functionality done, but need frontend work checking if sync has finished
CDB-1100 modified gap of manual syncs to be 15 min
merged master
Merge branch 'CDB-1100' of github.com:CartoDB/cartodb into CDB-1100
CDB-1100 - requesting sync now from a table model already synced
CDB-1100 modified routes
CDB-1100 - removed silent when synchronization model is set to syncing state
Merge branch 'master' into CDB-1100
CDB-1100 #resolve - waiting 15 sec before polling + setting failure state when error code or message appears
Merge branch 'master' into CDB-1100
CDB-1100 #resolve - when synchronization fails, sync now button disappear