adding the promotion detail page
Merge branch 'master' of https://github.com/lorenariel/123456

Conflicts:
	main/java/com/beans/CalendarModelBean.java