Control 2
Merge branch 'master' of https://github.com/MAMISHO/IT

Conflicts:
	EPD3/IT_EJ1/web/index.jsp
Control1