Update Nginx
Rename lua to lua52 to avoid naming conflicts
Merge branches