Merge branch 'master' into stable

Update gitignore and remove test output
add future payment functionality
merge pom.xml
Merge branch 'rel-1.6.0' into stable
Merge branch 'stable'