Merge pull request #312 from ndomar/C3_S4_Reopen

C3 s4 reopen
fixed conflicts head merge to master
Merge pull request #326 from ndomar/fixing_samy_head_gemfile

fixed conflicts head merge to master