artigosgrid
Merge branch 'HEAD' of https://github.com/adrianojlt/webTT.git

Conflicts:
	extjs/mvc/app/view/AmostrasGrid.js
	extjs/mvc/app/view/Artigos.js
	extjs/mvc/app/view/Viewport.js