merged changes from shanti_kmaps and latest changes for shanti production from rubyforge
merged changes from shanti_kmaps and latest changes for shanti production from rubyforge

shanti-uva/shanti_integration,shanti-uva/shanti_integration,shanti-uva/shanti_integration