fixed map
Merge branch 'development'
modified test.html.erb and the controller to do some ajax-json stuff