missed mousetrap
Merge branch 'master' of github.com:mygoare/peditor

Conflicts:
	bower.json