Moved DAO and some MODEL elements out into EJB s
Resolving the unnecessary moaning of the GIT app
Added test Spring mapping for /User
Merge branch 'master' into Spring
adding pic
Merge branch 'master' of ssh://myservlet-subwoofer359.rhcloud.com/~/git/myservlet

Conflicts:
	src/main/webapp/images/profile.jpg
Merge branch 'master' into Spring
Merge branch 'ejb' into Spring

Conflicts:
	pom.xml
	src/main/java/org/amc/servlet/APLMaterialServlet.java
	src/main/java/org/amc/servlet/APLProcessServlet.java
	src/main/java/org/amc/servlet/APLSystemServlet.java
	src/main/webapp/JSP/Main.jsp
	src/main/webapp/JSP/PartsSearchPage.jsp
	src/main/webapp/JSP/ProcessPage.jsp
	src/main/webapp/WEB-INF/JSP/ProcessSheetSearchPage.jsp
	src/main/webapp/css/theme.css
Fixed ref to tld
Fixed issue with missing merge of EJB
Create User JSP and Spring method to connect to it. Need to add entityManager some where
Resize bk pic so it will load faster
Merge branch 'master' into Spring

Conflicts:
	src/main/webapp/WEB-INF/JSP/ProcessPage.jsp
Created Users View
Moved MyServletUser to view
Imported OpenEJB code
Added dependency on OpenJPA and OpenEJB
Added some java doc
Removed 'Bean' from class names of EJBs
Removing 'Bean' References
Remove dependency on openejb
Changed Material from a Stateful bean to a JPA Entity