Merge remote-tracking branch 'origin/GitIntegration'

Conflicts:
	.idea/workspace.xml
	src/main/webapp/WEB-INF/pages/user.html
	target/sn/WEB-INF/pages/user.html
tmp
Merge branch 'master' of https://github.com/vgrinda/SocialNetwork

Conflicts:
	.idea/workspace.xml
	src/main/webapp/WEB-INF/pages/user.html
	target/sn/WEB-INF/pages/user.html