Spring MVC in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web_CA/.idea/workspace.xml
SpringMVC in progress