function refactor
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/pkr.js
function refactor