# Conflicts:
#	application/index/view/performance_ranking/performance_ranking.html
#	public/app/dist/index.html
#	public/app/dist/static/css/app.4f568cb9a5b022cb1426b7a078f4a466.css
#	public/app/dist/static/css/app.5ab84730046ae4475f21a1adba4a2d7e.css
#	public/app/dist/static/css/app.e35b08aaf11a10e5da9733ce5314e040.css
#	public/app/dist/static/js/app.97f570d50bfe395922d8.js