soooo many changes! to everything!
Merge branch 'master' of https://github.com/httpsters/nxt-repair

Conflicts:
	src/app/partials/payment.html