www-dev to www-live in master branch
Merge branch 'dev'

Conflicts:
	README
	pageapp.nginx.conf
fixed www-live settings
Merge remote-tracking branch 'origin/dev'
remove nginx.conf, not using it.
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/dev'
merge branch dev into master
added encryption script for passwords
updated README
Merge branch 'dev', remote-tracking branch 'origin/master' into dev