12
Merge branch 'master' of https://github.com/ITsocialnetwork/ITsocialnetwork

Conflicts:
	social_network_ui/src/main/java/it/social/network/controllers/HomeController.java
	social_network_ui/src/main/webapp/WEB-INF/web.xml
в
й
added footer and header