Fixed small merge conflict with View class
Fixed small merge conflict with View class

psychoticmeow/journey-cms,embarknow/journey-cms,embarknow/journey-cms,psychoticmeow/journey-cms,symphonycms/symphony-3,psychoticmeow/journey-cms,embarknow/journey-cms,psychoticmeow/journey-cms,embarknow/journey-cms,psychoticmeow/journey-cms,embarknow/journey-cms,symphonycms/symphony-3