fixed unit tests
improved template construction
added merchant display-name handling
android app added
android app added
load cfg added, icon changed, options removed