Jones Soda's WhoopAss re-enters market