Start with insert
Merge remote-tracking branch 'origin/master'

Conflicts:
	dev/js/medapp_test.js
	dev/js/pt.js