Don't create a VariantInfo object for each token on ios and SPS
 logger cleanups
Merge branch 'stats' into 1.0.x
improved merge so categories no longer get duplicated
added test to see that merging categories works
Removing EJB/Transaction from REST endpoints
Removing joined transactions...
making those services stateless ejbs that really need it