Added changes to the Time Entry to add MasterData
Merge branch 'develop' of https://github.com/entirej/incubator into develop