commit gemfile.lock
Merge remote-tracking branch 'origin/master'

* origin/master:
  Notify temp

Conflicts:
	Gemfile.lock
Seed file for furniture
update group price after delete furniture
notify count on navbar
notification cont