user management changes
Merge branch 'master' of https://github.com/lorenariel/123456

Conflicts:
	main/webapp/component/main.xhtml
	main/webapp/component/promotion.xhtml