Merge branch 'master' of https://github.com/gysy/dijkstra-jp

Conflicts:
	src/account/__init__.pyc
	src/account/admin.pyc
	src/account/models.pyc
	src/account/urls.pyc
	src/account/views.pyc
	src/db.sqlite3
	src/jpclass/__init__.pyc
	src/jpclass/admin.pyc
	src/jpclass/models.pyc
	src/score/__init__.pyc
	src/score/admin.pyc
	src/score/models.pyc
	src/signup/__init__.pyc
	src/signup/admin.pyc
	src/signup/models.pyc
	src/stationary/__init__.pyc
	src/stationary/admin.pyc
	src/stationary/models.pyc
	src/stationary/urls.pyc
	src/stationary/views.pyc
	src/survey/__init__.pyc
	src/survey/settings.pyc
	src/survey/urls.py
	src/survey/urls.pyc
	src/survey/wsgi.pyc
Merge branch 'master' of https://github.com/gysy/dijkstra-jp

Conflicts:
	src/account/__init__.pyc
	src/account/admin.pyc
	src/account/models.pyc
	src/account/urls.pyc
	src/account/views.pyc
	src/db.sqlite3
	src/jpclass/__init__.pyc
	src/jpclass/admin.pyc
	src/jpclass/models.pyc
	src/score/__init__.pyc
	src/score/admin.pyc
	src/score/models.pyc
	src/signup/__init__.pyc
	src/signup/admin.pyc
	src/signup/models.pyc
	src/stationary/__init__.pyc
	src/stationary/admin.pyc
	src/stationary/models.pyc
	src/stationary/urls.pyc
	src/stationary/views.pyc
	src/survey/__init__.pyc
	src/survey/settings.pyc
	src/survey/urls.py
	src/survey/urls.pyc
	src/survey/wsgi.pyc