Moved script/stylesheet merging functions into theme framework
Added vars for script/stylesheet merging
Added script/stylesheet merge functions