change 20 to dipsay in payment page to 14
Merge branch 'develop' of https://github.com/redapesolutions/jatomidjango into pt_booking

Conflicts:
	jatomi/membership/views.py