Merge branch
Changed userid into serial for autoincrement every insert,updated set and get stored proc