Practice change
Test
Merge branch 'master' of https://github.com/cisco729/beawolf.git
Merge branch 'master' of https://github.com/cisco729/beawolf.git
fixed error
Added Statuses Changes
Added status JSP
Adding Status Changes
Terry's Test
Committing changes
minor change to StatusInfo
trying to push to Master
Merge branch 'master' of https://github.com/cisco729/beawolf.git

Conflicts:
	docView/WebContent/META-INF/MANIFEST.MF
	docView/WebContent/WEB-INF/context.xml
	docView/WebContent/WEB-INF/struts-config.xml
	docView/WebContent/WEB-INF/web.xml
	docView/WebContent/jsp/configuration.jsp
	docView/WebContent/themes/base.css