commit to test the branch
Merge branch 'user' of github.com:dsfugimoto/lims into user
Merge pull request #3 from dsfugimoto/user

User
Added product list page
Começo da criação da tela de novo usuario
Suppliers and Product Types can be edited and activated/deactivated, New Button added to lists, added Page Product Details
Ignoring the .idea folder
Removing the Idea folder
- Added cancel button on create/edit pages;
- Added icon on edit buttons;
- Changed products and product_types tables;
- Created product_logs table;
- Removed the activate/deactivate button from producTypes.show and suppliers.show pages;
- Removed the method setStatus() from SupplierController and ProductTypeController;
- Created product log model;
- Product Log can now be created;
- Created Product Log list on products.show page;
- Product usage is update when log is created;
- Limited the usage field when creating log, based on remaining usage of product;
Merge pull request #4 from dsfugimoto/crud

Add the CRUD features
Merge branch 'user'
Merge branch 'master' of github.com:dsfugimoto/lims

Conflicts:
	app/routes.php
- Quantity of product type is now refreshed when a product of that type is added;
- Expiration date can't be less than purchase date on product.create page;
- Product seed updated;
Removed some unused files
- Updated the edit/create forms when the supplier/productType is no longer active;
- Updated the usage logic of products;
- When product is fully used, productType quantity is decreased by 1;
Merge branch 'master' of github.com:dsfugimoto/lims into crud
fix routes after merge
Merge pull request #6 from dsfugimoto/crud

Crud