updating the editor prototypes
Merge branch 'master' of http://github.com/rswingler/byuwiki

Conflicts:
	server/view/Editor/showdown-master/showdown-master/src/test.html
updating editor prototypes