Completed struts_tiles
Merge branch 'feature' into dev
Merge branch 'dev'

Conflicts:
	WebContent/index.jsp

After completing struts_tiles;

Exceptions reference WebContent/EXCEPTIONS.md