Added ingredient DAO and Service interface and class files.
Revert "Added ingredient DAO and Service interface and class files."

This reverts commit 386f941041bbe459cc7b80a063499dc35ec5c961.
Added Ingredient DAO interface and implementation.
Updated UserService interface with JavaDoc.
Re-ordered methods.
Re-ordered methods.
Added @Repository annotation.
Re-ordered methods.
Merge branch 'HEAD' of https://github.com/mattserrano/Barista-matic.git
into HEAD

Conflicts:
	barista-matic/src/main/java/com/pearson/baristamatic/service/UserServiceImpl.java
Added IngredientService interface and class files.
Replaced commons-logging with log4j and added log4j.properties to
classpath.
Changed annotation of getDrink() from @OneToOne to @ManyToOne to avoid
unnecessary unique constraint from Hibernate.
Implemented hashCode and equals for Hibernate composite key support.
Modified findUser implementation to use Hibernate's createQuery() method
instead of findByCritera().
Modified findIngredient() to use Hibernate's createQuery() method.
Added initial version of UserServiceImpl JUnit test.
Merge branch 'HEAD' into springSec_Barista
Added import.sql to add data to database automatically.
Merge branch 'HEAD' into springSec_Barista
Updated log4j to show Hibernate query parameters.