- fixing some formatting issues with output
- excluding file private.properties
- fixing some formatting issues with output
- added payment package
messing with git
Merge branch 'master' into HEAD