Merge issues

I will figure this out.
M
Revert

This
OK. FIXED IT.

Please note: it seem doesn't copy the directive js files.