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