Soooon done with payment
Merge remote-tracking branch 'origin/master'

Fuck conflicts