cleaned up the wwwserver builds
quick fix for template php, to work with nginx conf
Big cleanup of commands and docker abstraction
Merge branch 'develop'