Merge pull request #169 from jasvir99/dirty

Remove errors due to multiple active taxes.
admin.py modified
Merge remote-tracking branch 'upstream/dirty' into dirty

admin.py modified
Merge pull request #170 from aashitadutta/dirty

Admin.py modified