jack commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/public/js/views/checkpationwithitem.js
jack commit