using ruby 2.1.2 now
deleted outside script code for jquery so I'm using default rails jquery
Merge branch 'front-endv3'