merging kmlframework. Changes to buildfiles