update: wiki, bugs.java.com in bugs.sun.com out
comment out Options
update: wiki
ateraimemo.com in terai.xrea.jp out
Merge branch 's502-develop' into s502-pages

Conflicts:
	.htaccess