Merge branch 'appengine_java6_fix' into issue330_d3layout
Merge branch 'master' into issue330_d3layout
Merge branch 'issue330_d3layout'
#335 Merging Elena's layout work in concept graph, so I can borrow in the ontology graph. Borrowed menu behavior already.