nightcoffee
Merge branch 'master' of https://github.com/MagicSolution/AddonSocial

Conflicts:
	css/jquery/jquery-ui.min.css
	css/jquery/jquery.ui.autocomplete.min.css
	css/jquery/jquery.ui.core.min.css
	css/jquery/jquery.ui.menu.min.css
	css/style.css
	fonts/fontawesome.eot
	fonts/fontawesome.svg
	fonts/fontawesome.ttf
	fonts/fontawesome.woff
	fonts/license_fontawesome.md
	images/user-avatar.png
	index.html
	js/jquery/jquery.ui.autocomplete.min.js
	js/jquery/jquery.ui.core.min.js
	js/jquery/jquery.ui.menu.min.js
	js/jquery/jquery.ui.position.min.js
	js/jquery/jquery.ui.widget.min.js