atualizacoes para adicao de server e client.
teste
Merge branch 'master' of https://github.com/rafaeloliveiraandrade/vopp-back-office.git

Conflicts:
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/product-list.js
	app/views/product-add.html
	app/views/product-list.html