fixes a bug
Merge branch 'master' of https://github.com/dirkschumacher/iUPB

Conflicts:
	config/initializers/rabl.rb