1218
Merge branch 'master' of https://github.com/Shotaimen2014/Jokiso2014-12-18

Conflicts:
	1218
Merge branch 'master' of https://github.com/Shotaimen2014/Jokiso2014-12-18