adding taglib
Merge branch 'master' of https://github.com/stevejmason/TrainingProject-1

Conflicts:
	Build/eclipse-workspace/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
Merge branch 'master' of https://github.com/stevejmason/TrainingProject-1

Conflicts:
	Build/eclipse-workspace/src/main/java/com/cconsult/yescorp/util/Skill_JDBC.java
	Build/eclipse-workspace/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF