.
Merge branch 'master' of https://github.com/inamvar/bazaar

Conflicts:
	src/main/resources/META-INF/spring/root-context.xml