First step to fix /bennibu/foodsoft/#93
Merge branch 'rails3-fixnonstockarticledeletion' of http://github.com/balkansalat/foodsoft into rails3-fixnonstockarticledeletion