Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/header.jsp
	target/monitor-0.0.1-SNAPSHOT.jar
Merge remote-tracking branch 'origin/master'