improved merchant activation
added android integration