test
Merge branch 'master' of
https://github.com/Bey0ndZ/TOLCDiscussionForum.git

Conflicts:
	src/main/webapp/WEB-INF/spring/root-context.xml
	target/m2e-wtp/web-resources/META-INF/maven/edu.tolc/discussionforum/pom.properties