added protractor and two new views
merged changes