final updates
Merge branch 'master' of https://github.com/jbantug/meteorERP

Conflicts:
	client/client.css
Merge pull request #39 from rnecesito/master

updates (merged files from linfiesto's commit)