Test Cell
Cell  131231
Multiple zoom test
TEst sort - multizoom
Merge branch 'master' of https://github.com/certae/ProtoExt

Conflicts:
	db/testproto.db
	static/js/UI/MDDetailsController.js
	static/js/view/ProtoForm.js
	static/js/view/ProtoMasterDetail.js