conflicts resolved

all resources added to make work protractor easily

Ease protractor use

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

cookieStore instead of cookie

Make solution and guidelines consistants

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