Fixed login bootstrap
Merge pull request #21 from leonliang0395/master

Fixed login bootstrap
Merge remote-tracking branch 'upstream/master'

Conflicts:
	serviceWebsite/tesla/app/templates/login.html

Merging with Leon