Merge branch 'proj/mastertest2'
Merge branch 'master' of https://github.com/SunriseDigital/improve-condition
fork add1
Merge branch 'proj/forkTest3' of github.com:nabeqo/improve-condition into nabeqo-proj/forkTest3

Conflicts:
	watanabe/index.php
Merge branch 'nabeqo-proj/forkTest3'