Update the folder framework.
Merge remote-tracking branch 'origin/master'
Merge the first confilcts