Changed language.
Merge branch 'master' of https://github.com/horozco/Stocktaking
Added model user to activeadmin