updated shashlik
updated shashlik standalone
Updated shahlik files
Merge branch 'master' of github.com:cms-fcal-upgrade/ForwardCaloUpgrade
Added shashlik standalone modifications