autowired
autowire by setter injection
autowire by setter injection
Java Configuration with AppConfig
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Application.java
	src/applicationContext.xml
	src/com/pluralsight/service/CustomerServiceImpl.java
Java Configuration with AppConfig