Added test package to setup.py
setup.py modified
Merge pull request #5 from simmianand/master

Modified setup.py
Modified billing.py
Modified
Conflicts resolved

Conflicts:
	billing.py
Modified timeline.py after following pyflakes,pylint,pep8
Modified billing.py,tryton.cfg,timeline.py
Merge branch 'master' of github.com:tarunbhardwaj/project_billing
Inherited project.work class
Modified timesheet class
Modified timesheet lines
Merge pull request #7 from simmianand/master

Modified timeline.py file