Merge pull request #1 from jbantug/master

Revert merge
merged changes from linfiesto
Merge https://github.com/rnecesito/meteorERP
Merge pull request #30 from rnecesito/master

Merged conflicts from linfiesto