Ansis Brammanis 0bb805f557 Merge remote-tracking branch 'systemed/master' into presets ...

Conflicts:
	css/app.css
	index.html
	js/id/connection.js
	js/id/modes/select.js
	js/id/ui/inspector.js
	js/id/util.js
	test/spec/modes/add_point.js

2013-02-14 11:38:18 -05:00

..

confirm.js

Fix tests

2013-02-05 12:10:05 -05:00

flash.js

Fix tests

2013-02-05 12:10:05 -05:00

geocoder.js

Fix test

2013-02-12 16:18:55 -08:00

inspector.js

Merge remote-tracking branch 'systemed/master' into presets

2013-02-14 11:38:18 -05:00

modal.js

Fix tests

2013-02-05 12:10:05 -05:00