init

init
Merge branch 'master' of https://github.com/twocabbages/web-im

Conflicts:
	.gitignore
	LICENSE
	README.md
	bootstrap.js
	css/bootstrap.css
	css/webim.css
	easemob.xmpp-1.0.0.js
	favicon.ico
	img/bg.gif
	img/chat.jpg
	img/chat_bar_bg.jpg
	img/chat_title_bg.jpg
	img/e_logo.png
	img/head/2016.jpg
	img/head/contact_normal.png
	img/head/find_more_friend_addfriend_icon.png
	img/head/group_normal.png
	img/head/header2.jpg
	img/head/mm_title_btn_add_contact_normal.png
	img/head/mm_title_btn_compose_normal.png
	img/icon.png
	img/layer_arrow.png
	img/recycle.png
	img/send_btn.jpg
	img/status.gif
	img/title-bg.png
	img/title_bg.jpg
	img/waitting.gif
	img/wlf_bg.png
	img/wlf_title_bg.jpg
	img/wlf_title_btn.jpg
	index.html
	jquery-1.11.1.js
	json2.js
	quickstart.md
	release.txt
	strophe-custom-1.0.0.js