added tiles
Merge branch 'master' of https://github.com/maxfirecheetah2/Students
last by Max
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/exadel/entity/GeneralInfo.java