Mv: Nginx talk will be fore Git one
Add: space for Les' Nginx talk
tMerge branch 'upstream-develop' into develop