payment
Merge branch 'master' of https://github.com/DavidSalzer/110-app
popup and pay section
icons
Merge branch 'master' of https://github.com/DavidSalzer/110-app

Conflicts:
	index.html
qw