[Configuration] Spring, JSF Configuration
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/TAITwittee_war_exploded.xml
	TAITwittee.iml