merged arora to master
Merge branch 'aayush'
corrected conlficted merge at login.html, urls.py, forms.py
completed user classification into company and customer