Added employer field on device
Merge branch 'master' of github.com:rakhmatulin/hackathon14

Conflicts:
	hackathon14/urls.py
Merge branch 'master' of github.com:rakhmatulin/hackathon14