merge
Added gluster talk