Merge "Merge Resource Directory into the master"