refactored
Merge branch 'dev' of github.com:snwfog/ppedit into dev

Conflicts:
	ppedit/js/ppedit.js