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

Conflicts:
	Dev/SocialWebApp/SocialWebApp/Resources/css/style.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/SocialWebApp/SocialWebApp/Resources/css/style.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/SocialWebApp/SocialWebApp/Resources/css/style.css