iss4
ignoring nb-configuration.xml
basic payment support
merge with master
iss4
iss4
minor refactoring
minor changes
merge from master