925
Merge branch 'master' of github.com:balajiteja/WebQ

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.java.asep.web.quiz/WebQuiz/pom.properties