master branch keeps its own version of pageapp.psgi
keep lib to the live version in master
keep our pageapp.yaml when merging with other branches.
merge with dev
fix the right db location
Merge branch 'dev'
get rid of .gitattributes
get rid of .gitattributes
add live IP to reverse proxy list
fix www-dev into www-live
Merge branch 'master' into dev
www-live should be www-dev in dev branch