angular factory setup
Merge branch 'angularfactory'