added parties controller
fixed inflection file confilct
fixed conflict with latest pull
fixed parties controller conflict