milgiorie
Merge remote-tracking branch 'upstream/master'

Conflicts:
	base/src/main/resources/META-INF/base.taglib.xml
	base/src/main/resources/META-INF/base/breadcrumbs/dynamicBreadcrumbs.xhtml
	base/src/main/resources/META-INF/base/menu/menuBox.xhtml
	base/src/main/resources/META-INF/base/menu/menuBoxSxBase.xhtml
Merge pull request #22 from pisi79/master

taglib clean up