Bug SIDI
BUg SIDI2
Correction Form MD
Merge branch 'master' of https://github.com/DarioGT/ProtoExt into js2db

Conflicts:
	db/testproto.db
	static/js/proto/ProtoPcl.js