outputing all promo codes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/nclodger/control/action/ActionFactory.java
	src/main/webapp/smsettings.jsp
outputting promo codes.