pom file changes,properties for junit version and jdk version
Merge branch 'develop' of https://github.com/StraightBeastApps/RealBigD-web into develop

Conflicts:
	pom.xml