Merge branch 'master' of https://gitlab.com/PPL2017csui/PPLA1 into develop

# Conflicts:
#	.gitignore
#	README.md
#	assets/js/index.js
#	core/templates/core/index.html
#	kape/settings.py
#	kape/urls.py
#	package.json
#	webpack.config.js