add public dir as web root
Merge branch 'base'