local update
Merge branch 'master' of github.com:jikk/jikk_web

Conflicts:
	application/res.tex