Fixing conflict and Push

@futhr I add some new spec codes and it works well. Now coverage percentage is 82.76%. I tried to make a spec of RelationsController->create but I have failed. Please check it would work well.