Added basic User class
configuration files modularization
Merge branch 'master' of https://github.com/Desmond14/agh-networking-platform

Conflicts:
	src/main/webapp/WEB-INF/spring/mvc-dispatcher-servlet.xml
	src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of https://github.com/Desmond14/agh-networking-platform

Conflicts:
	src/main/webapp/WEB-INF/spring/mvc-dispatcher-servlet.xml
	src/main/webapp/WEB-INF/web.xml