conflicts resolved

all resources added to make work protractor easily

Ease protractor use

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