banalitycs
[ci skip]
Lots of changes
Merge branch 'develop' of github.com:webhat/Working-Title into feature/banalytics
Merge branch 'feature/banalytics' into develop
Merge branch 'hotfix/PaymentUniq' into develop

Conflicts:
	src/main/php/paying.php
travis should be OK again
travis should be OK this time
Payment fixes
Merge branch 'release/v1.18'