Add model properties

Added the following classes:
-ModelProperty - property on model
-MergedModelProperty - property on merged model that handles choosing
the correct value between two mapped properties

Also added unit tests for each class