dummy
Revert "dummy commit"

This reverts commit 0e4492be1eb9f158a4e7496a952e326966f125c1.

Conflicts:

	Gemfile.lock
stringex gem adjust because of rails4
stringex fix2
Merge branch 'production' into chat

* production:
  stringex fix2
  stringex gem adjust because of rails4
  Revert "dummy commit"
  dummy
chat branch stop