add basic protractor testing framework
merge and resolve conflicts