permissions et boutons
formatage
Merge branch 'master' of https://github.com/certae/ProtoExt

Conflicts:
	db/testproto.db
	static/js/globals/variables.js
	static/js/ux/ProtoZoom.js
	static/js/view/ProtoGrid.js