moved timing stuff before payment stuff
Merge branch 'master' into step3

Conflicts:
	step3.php
changed active color for duration bar