add rubyversion, splimify (not working yet)
Merge branch 'master' of https://github.com/dotob/satt

# By sebastian krämer
# Via sebastian krämer
* 'master' of https://github.com/dotob/satt:
  fix orderitem coutn on grouped view
  userordersview: disabled add orderitem buttoln when master order is
closed
  change devise email, change year
  masterorderview: show counts, always show close button
  mailer: change adresse, only mail user with orderitem
  update rails, add thin

Conflicts:
	Gemfile
	Gemfile.lock
new search