Added ' | ' structure to some messages: this lets us split messages into
a more general problem and line - specific detail
Merge branch 'master' of github.com:kls2510/UROPTestingSystem

Conflicts:
	src/main/resources/CheckstyleFormat.xml
Fixed conflict
Messages now split into more general problem and spcific detail.