schema.rb delete
gitignore
delete emoji.rb
fix search friends panel
delete empty files
Merge branch 'fix_search' into develop
add ico facebook and github
fix ico
	Merge https://github.com/SBS-team/chaaat into develop
Open chat links in new panel
FIXME
Merge branch 'fixme' into develop
merge
chages schema
gravatar avatar support
avatar support with gravatar gem added
Update README.md
Delete .gitignore
Merge branch 'develop' of github.com:SBS-team/chaaat into test

Conflicts:
	app/controllers/friendships_controller.rb
test