1047
1047
1047
1047
1047 123
1047 123
Merge branch 'master' of https://github.com/faudzif/quickpay

Conflicts:
	Markup/js/default.js