flash added
Merge branch 'master' of github.com:Hajimex/Mehul

Conflicts:
	css/chat_window.css