Added attributes to model
Search pages edited
Merge remote-tracking branch 'origin/Develop' into Develop