Add ResourcesFactory
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	java_and_frontend_project_SDVM.iml
	server_tml/main.html
	src/main/java/base/AccountServiceImpl.java
	src/main/java/utils/UserProfile.java
	target/classes/admin/AdminPageServlet.class
	target/classes/base/AccountService.class
	target/classes/base/AccountServiceImpl.class
	target/classes/frontend/LogoutServletImpl.class
	target/classes/frontend/MainPageServletImpl.class
	target/classes/frontend/ProfileServletImpl.class
	target/classes/frontend/SigninServletImpl.class
	target/classes/frontend/SignupServletImpl.class
	target/classes/main/Main.class
	target/classes/utils/UserProfile.class
gitignore
Merge branch 'master' of https://github.com/SorokinDmitry/java_and_frontend_project_SDVM