Reverting
Dev Branch
Model Properties Added
Fixed Bugs
Merge branch 'development'
Commiting to Merger