Changed git pull to git fetch and git merge.

update

update

update

update

update
Merge branch 'dev' of github.com:mkey0bc/rsProvisioning into dev