avoid cond /Swing/.html
Merge branch 'sakura-develop' into sakura-pages

Conflicts:
	data/jruby/p2m.rb
update: wiki