User's Instance Servlet
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/web/WEB-INF/web.xml
User's instances table