Don't create a VariantInfo object for each token on ios and SPS
Call onSuccess at the right time
logger cleanups
Merge branch 'stats'
improved merge so categories no longer get duplicated
added test to see that merging categories works
Merge branch 'category'
fixed category spacing
Removing EJB/Transaction from REST endpoints
Removing joined transactions...
making those services stateless ejbs that really need it
Applying transaction overhaul to windows endpoint, on master
Merge branch 'Transaction'
added note to README about frontend.clean.force
added missing deps: ng-idle, angular-animate AGPUSH-1025

Conflicts:
	admin-ui/bower.json
refactored logout-after-inactivity feature - leverage ng-idle, refresh keycloak token periodically AGPUSH-1025
AS7 valve doesn't make sense here
Merge branch 'valve'
Update code snippet with latest
Refactored Installations retrieval to work with roles