updates flog and launchy versions
merge conflicts