merge silly conflict
Merge branch 'master' of https://github.com/mzdravkov/projo
Move default root to the application in the jails; backup nginx.conf just in case