fix category duplication while renaming
Merge remote-tracking branch 'origin/develop' into ionic-2