Fixed log paths
Merge branch 'master' of github.com:gravityblvd/tools.gravityblvd.com

Conflicts:
	conf/nginx.conf