more merge conflicts, install apge
Merge branch 'master' of github.com:Esri/Terraformer
install page
install page
Merge pull request #206 from patrickarlt/master

install page