category
push
Merge branch 'master' of https://github.com/mike2duo/ducking-computing-machine

Conflicts:
	helpme/helpme/AppDelegate.m
	helpme/helpme/Source/Managers/HTTPManager.h
	helpme/helpme/Source/Model/CategoryObj.h