Pushing to nullify some error which appears from last commit.
Fixed some minor dajaxice bugs, Solved Issue #17 with misc.test.populate_db()
Fixed merge conflicts
Merge branch 'master' of https://github.com/ShaastraWebops/ERP14

Conflicts:
	erp/urls.py