update
Merge branch 'v1.6.0-more' of https://github.com/SmartekWorks/smartekworks.github.io into v1.6.0-more

Conflicts:
	ja/swat/article_window.md
	swat/article_window.md