updating function name in Category class
Merge branch 'development' into alvaro