Fixed state problem in factory girl for user
Removed double add category-btn
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop