Adding for files that were corrupted on last pull.
Committing to fix merge conflicts
Committing to fix merge conflicts
Merge branch 'master' of https://github.com/cisco729/beawolf.git

Conflicts:
	docView/.classpath
	docView/.settings/org.eclipse.wst.common.component
	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/src/com/fmsolutions/folder/action/StatusAction.java
Merge branch 'master' of https://github.com/cisco729/beawolf.git

Conflicts:
	docView/src/com/fmsolutions/folder/action/StatusAction.java