Change graph x axis to time
Merge branch 'analysis' of https://github.com/subwoofer359/aplsystem into analysis

Conflicts:
	src/main/webapp/JSP/DisplayProcess.jsp