Feature/upgrade jquery and boostrap