conflicts resolved

all resources added to make work protractor easily

Ease protractor use

remove comments which make fake differences between branches....

pagination position
Merge branch 'step3' of https://github.com/got5/TrainingAngularJS into step3