Merge branch 'master' of https://github.com/balajiteja/WebQuiz

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.teja.webQ/WQ/pom.properties