Merge pull request #2 from tarunbhardwaj/master

Completed task #985
Extended employee model
* Added required=True in the fields
resolved conflict
Merge pull request #5 from simmianand/master

Added content to fields
Update __init__.py
resolved conflicts